Improved TimingAlignment
Adding calibration events
Small improvements to timing alignment