viewer fix + more plugin