Spoilers! YAY. Again.

More fixes, could probably release now.