Fixed alot of things..