make this all ready for packaging

It couldn't be packaged as it stood.