oops -- multiple errors in previous commit