edits to setup due to conflicts on pypi