updated self_contained
added/fixed many cross-references