fixes to configuration and packaging after complaints from JHLJ