Comments, and various cleanup