Fixed a bug, but broke everything else. Whoops, I'll fix it tomorrow.