fixed some references in comments, added @overrides to things