Some more work on ACE/editing (buggy)