Fix some typos and some alignment issues