Fix alot of stuff