updated to address some problems Don found in pull request