fix stuff from 12/5 code review, and fix A scaling