Edit handlers and some other mistakes.