improved mushroom; renamed effect classes