cleaned up some comments
getting ready for merge from branch
Merge branch 'sa_transit-branch1.0'
fixed some comments in branch and merged with master