Fix bugs, improve success message