error message updated and waits() added