fill in a couple todos