404 95% changes made based on e-mail comments