pop a couple more things off the TODO