converted all TODOs to issues, removed some dead code, tiny Invocation refactor