a few more todos, back in a proper editor