Tweaks

Always more tweaks!