add success message and minor fixes