Quick change

removing some useless comment fields and adding some awesome ones
Merge remote-tracking branch 'origin/master' into Tim