added half of the error messages
fixed merge conflicts