Allow main to handle shape strings with spaces
Few cleanups in distributions