Tuning and performance testing changes, minor glitches fixes