updated preview
fixed small issues