some minor fixes and additional messages.