Fix some random bad variable names and stuff