added a couple of todos