brian's fixes (initial) for topic 2