Clean up synchronization, and rescue some parser errors
Merge branch 'master' of https://github.com/shuyangli/TheIronBank