Updates - bringing up the standards
Fix errors, bring up standards