add makeup, add 404 error
refactoring