added success messages, reworked error messages
fix conflict