fixed some stuff
really this time