a couple small edits, untested