BerryBushes change model
Some code fixes