Full support for switching between 3x3 4x4 and 5x5
Fix difficulty check