adding some scheduling stuff
fixing merge stuff