TODO file, maximum tuple count for samvis, small changes