Made a few minor tweaks to support enhanced features as indicated in the readme file.