More messaging and some error correctoin.