Typo fixing, more error handling, and more synchronizations