fixed a couple locations, updated todos