misc changes and edits for Condor