Shiny Updates Update 6/10

#4-6, #shiny-updates