better error messages
update + 2 new