fixed alot of shit