Develop

Addresses priority issues submitted by @jcdwyer1