Fixed alot of problems