Tweaks

Anyone able to review?