Minor tweaks + Almost cave generation of claim zone