minor changes, updated todos