variety of updates, fixing and code cleanup on EMC2 object linking, etc.