- added final modifier nearly everywhere