Some viewer bugs fixed but not all.