Updated modules trying to improve timing
Manual merge on matcher.v