Entity updated, FarmMap.del support improved and minor fixes