improve preview image size, timing
marge master branch