more deadwood gone and viewer implementation added