More correction and simplification