A lot of minor changes; some renaming; more lazy vals