Update master script; add dir vars
Remove more cruft