added dispatch, some minor updates