Tuple edits

Fixed tuple bugs