easier to understand normative names
small visual fixes