Fixed input, started work on editor