final changes to layout and comments