updated documentation and simplified a couple overrides