patch for deployment added; couple more user messages in the end