lots of shit changed

god please work