Added override tags, deleted some old commented code.