made it pretty
changed some stuff