Header comments, cleanup

Version 3.1.2