Typos and moved some passages into better sections