minor tweaks

but a couple of more difficult issues seem to have appeared...