re-ordered master construction and changed master image names and better master run command