matcher basics, and other improvements