Stage 3 checking tested and working. Also added minor code tweaks to improve check results.