Cleanup: removed TODOs and added NEEDS FIXINGs as appropriate