Improvements to bin/setup