changed -x flags in all scripts, various tinkering