Several variable fixes and minor changes