More stuff and error pages
Merge branch 'master' of github.com:snltd/cassingle