bug fixes, pop_up_gallery using ImgeeFiled and async stuff