fixing alot of stuff :D