a few small edits, some due to good input from Josh Cowan and Ben