Clean up
enable module to read dist info from environmental variables
fix
fix