breakpoint variables and gallery fix