gallery fix, general issues