fix some bugs. remove images from main