fixed encryption, major testing required
fix encrypted tox loading
remove dead comments
Merge branch 'pr523'