Comments, general cleanup, ready for submission!?