Fixed alot of shit