upgraded controls a bit, added states for introducing editor.