minor fixes for editing all over the place, part 2