Fixes based on Gina's feedback. I am an excellent programmer.