Removed some comments. Moved the comments at the top of functions into a summary tag at the top of that function.
Resolved merge conflict.