Fixed some stuff
eof