Updated several areas to address the concerns expressed.  Please see the diffs for more info.