continue adding fixes based on Loretta's feedback