fixed some stuff
And some more stuff :)