Improve setup scripts all around