fix all the crap

:D