Fixing some stuff, breaking some stuff... such is life.
Fixed more stuff.