Some tweaks
Tidying up debugging