Consolidate feedback in viewer and other bug fixes