Fixed alot of errors