couple of incremental fixes & tweaks