Addresses issues in 14 (permission instability)

Multiple modifications to address issues within #14. Further testing is required to ensure these changes resolve all of the instability issues or if additional work needs to be done (so 14 should remain open).