fix for m2e bug and base runner now better