Fixed a few things, broke a few things