all dem missing overrides; some minor cleanup