Tweaks accomplished while doing discovery.

Nicely done! This was lots of fun...

nJoy!