minor cleanup, updated todos