several enhancements plus 6 pull requests into the master code