Fix setup/packaging details
Packaging tweaks