@yomi - minor tweaks