Bugfixes; PyPi packaging corrections