Added executor summary step and some fixes