changes to lukesbrnach, semantic checking needed on nested pair retrievals
Minor merge changes.