More fixes.
So much new stuff.