very minor changes that I decided to commit rather than stash