error messages, confirmation page and some fixes