merge in UW isis changes; my merge is untested, but SCCS id's