Updated verbiage
Removed some unused commented out code
Merge branch 'updates'