More commenting on main.java and other stuff

Fixed presentation of commenting and some if statements.  Added brackets
when necessary.