Lots of fixes.
Merge branch 'master' of github.com:Oblify/Server