Merge pull request #27 from scooperstein/master

a few more fixes
update FSA to HEAD and a few changes to zh