Timings improvements
Fix exp merging