Fixing more stuff.
I'm alive!