Smaller typos fixed in comments and TODO-s.