Various fixes.
Merge branch 'master' of github.com:jamesread/upsilon