[@Alarieth]Changed some stuff, tell me if I need to do it some more