Comments, Docs, and Clean-up.