more cleanup
compiler warnings
more cleanup
even more cleanup (mostly done now)
fix
cleanup