some more edit mode bugs squashed