Corp mask fix

Changes to access mask list in calculator to match Corporation key
masklist. Some verification logic and general code slinging