geoffrey tweaks
more geoffrey tweaks