Various Changes, most internal