Added Herbolore, some fixes