moar pep8, plugin framework tweaks