bug fixes and better scripts, plus make job flags