First round of changes per Anthony's suggestsions.