Changes to comment look, layout. Functions, etc.