match work and bug fixes