Added comments
Merge branch 'master_fresh' of https://github.com/kevinbrink/CP3_Enhancement into master_fresh