fixed typo
comment update
fixed incorrect error messages
merge conflicts