buttons changed
added messages and errors