fix minor bugs after refactor
pypi version bump