Fix alot of shit doddi fucked up