changes to dispatch and some other stuff