Fixed the things.

Albeit the things I broke...