Fixed a bug in doUncover where uncovering would stop completely when
uncovering a non empty field. Testcases changed to test this behaviour.
Minor improvements in readability