fix some issues and add success message