Lots of general cleanup, overall minor things