Several updates dealing with better error handling / messaging and other things