small fixes and grapes update