Add better comments and enable matchit again