replace prep match by VS match, minor fixes