make a few tweaks for consistency /issue #11