Version bump

Deactivate setting, some tidying up