Fix contributors
Fix the infinite loop of matches
Always remove the bar