Make package PYPI compliant + few fixes