fixed stuff
Fixed all :D