more+ fixes