o Remove some unnecessary debug output.
o smallish tweaks.