minor changes, new names for several values