marking some todos; project's getting big enough that it's hard to know status off-hand