pull updates from master; updates for gallery printing