various changes!  notes frm Dan.