Further tweaks

Tweaks to tweaks!