fix some typos, use overrides where necessary