Fix things

Values,  etc.