Extra messages to users and final fixes