Massive MASSIVE bugfixes.