Add FIXME comments to indicate potential problems & needed revisions