fixing some of the manual dynamics matcher