pulled from the main repo and changes made for the linting error messages

now its all fine, no errors