Fixes case sensetivity bug and Refactors Doubles match form