add in 404 page, minor cleanup in other areas