miscellaneous changes from summer break
stuff got lost Merge branch 'master' of
https://github.com/fangfx/YRZPersonalPage