fixed a few typos/bugs
Merge branch 'master' into festival-independent