Comment lots of things, edit a few things