comments, implementations of some missed override methods, and general PR feedback.