comment additions and fixes