more fixes to comments and very minor code rearrangement.