Improved Q/sortable and Streams/related tools