Improved face model courtesy of Yose, assorted tweaks