Correct typos, add information, fringe cases