Spoilers now kind of work, but they're still messy