tidied up info and error messages