Add aborting if not on master, fix output