nate updates -- fixes to topic 2, mergings with dan