Fix editing bugs

Make things generally more pleasant / "working"