More work on input editor