add FIXME comments