Feature requests 74, 78, 84, 85, 97, and 165

Corrected pull request from dev branch.