Added more testing code to remaining scripts
Added a little logic around prompting for variable values