Tweaks and more tweaks
Small tweaks