Fixed some errors and added matcher