Minor integrity and performance improvements.
Merge branch 'master' of https://github.com/Nathan-Wall/Secrets