Fix some typos and layout