Resolved minor TODOs