Various adjustments and fixes.
Merge branch 'master' of https://github.com/davidschaller/alma1