Minor updates
A bunch of mostly comment updates, but some bug fixes