Handle additional GSIV output & update TODOs