Flash notification changes, other minor edits