minor improvements to MASTER driver script