Danger is near: Update 0.25.416

Multiple client edits.