additional tweaks and tidying