Fancied-up the adhoc setup scripts