started tweaking tuples and arrays to be a bit more flexible