Various changes... still not working goddamnit