Tuples, lists and some little fixes