structural update
tuples
class improvements
update comment