Minor changes & add a batch run file