code cleanup
fixes
clean-up, clean-up, everybody clean-up
reduced compiler warning spew to acceptable level