added separate transition objects and fixed some scheduling issues
merge