All-around fixes
Merge branch 'master' of https://github.com/bcen707/china-first