Minor changes, added matchit