More variable name problems fixed.