Tweaks

Change success message, etc