fix statusline and add matchit