minor cleanup and add some todo-warnings