error messages, confirmation screen and some fixes