fix a couple of todos