MASSIVE BUGFIXIN.
Most of the bugs left from the schema change a now fixed. I hope (they're probably not).