Fix everything ever, everything seems to work okay now