Fix for transition end event firing
Improve logging