Add Match API.
Javadoc fixes and completion.