make some stuff a bit more generic
added some more pep8
disable automated encoding until everything is supported