fixing stuff
cleanup