Merge pull request #505 from raistlinthewiz/develop

misc fixes
Merge pull request #506 from raistlinthewiz/develop

Misc improvements
Merge pull request #509 from raistlinthewiz/develop

Misc fixes
Update conf.py
Update conf.py