Various big fixes.
Merge branch 'master' of github.com:matthias-springer/tode-web-amber
Merge branch.