fixed some stuff - I cant remember what