more changes. better error page.