couple of todos, and fix the toolbox