Fixed a few things and broke more