major commenting update and some cleanup