bug fixes and 404 page