HV-725 Misc. fixes and clean-ups
HV-604 Adding section on implementation of class-level constraints