fix successMessage
fix bugs