better comments and better 404