Update help messages

Update help and error messages according to PR Comments.