Added some content, edited error pages