Some matching improvements, documentation and make fixes