updates to gadgets management, cleaning up sorters test/list headers spec