viewer bug fixes