Added error page and changed some more code