Beginning Spring Cleaning, and may have fixed a bug.