Implemented suggestions, minor adjustment to flash notifications.