Fixed several typos and more progress