Fixed up the constant values that weren't working before

I didn't quite understand global variables before, I think it's working now though.