Some minor things.
Merge branch 'master' of github.com:venthur/mushu