add fixme comments