updated locator todos (merged into idea)