Fixing up some more crap. Nowhere near ready.