error messaging and more updates