add error page and some small enhancements