企业版

patches from various factions