tweaks identified and noted as FIXMEs or TODOs