Update PR

This PR includes all the changes I've made to make deployment work for me.
It also includes *many* syntax updates for pep8 compliance.