Mostly comment updates; a little restructuring