some tweaks & tidying