Viewer mega fix & Debug class