Minor changes, miscellaneous changes....
Merge remote-tracking branch 'origin/master'
Added in comments to help understand objects