EoD commit.
Fixed E/X response mixup, merging with master, pushing to a live server for feedback from team.