More fixes per feedback

making Alex write my code through comments!  Time for bed.