Fixed alot of stuff