Many supplications and viewer fixes