More fixes and changes and stuff.