some error handling messages
some little changes