add RPC and ME0 in SimHitMatcher and other updates