Updated readme, and tweaked setup scripts