Tweaked some things due to feedback from dwhly.
Tweaked some things due to feedback from dwhly.