Minor changes -added toasts, edited names.