added reload drawer matches; other fixes