A set of extremely minor fixes/updates.
Merge branch 'master' of git@github.com:ariesteam/aries.git