Tweaks to speed etc.