Made some more observations via TODOs