Completed comments and minor bug fixes
Fixed comments merge conflict