Added CoreMatchers class and fixed some compile errors.