More value changes

Progressive changes to eliminate direct being access of all values.