various detailed changes