final tweaks to make this work with setup.py in a usable manner