Major comments moved to headers, some cleanup