Fixed alot of things :)