some cleanup
more poking around
-Wall fixes