Added registers test, fixed matcher bug
Fixed bugs.  Took way more time than I'd like to admit