Removed alternative functor notation
removed double-dot ellipsis
added set operations