Made threads and memory options for mass optional.

Check for scheduler usage before issuing wait commands in MASS (this is a minor bug fix when running unscheduled).