fix some things, clean up