Fix editing bugs

I think we're good to be getting on now