More tweaks
bits n bobs