fixes for brian topic 2 feedback, round 1.