Fixed a lot

SQUASH!