finished commenting, cleaned up some includes
finished commenting, cleaned up some includes
Merge branch 'mike'