Simple fixes

Merge some changes to prepare for pypi.