added success notifications, cleanup code