Add Wishbringer's sanity check and formatting fix