review FIXMEs and TODOs, fix where required