Added FIXME flags
More bugs added