Add comments here and there, plus use new override keyword