Fixed alot of broken stuff