Changed Some stuff and tried to fix stuff