numerous updates, Tuple constructor changes
unit test passes