More stuff in editor and key binding