modified for swatch info and fixed some bugs
modified for swatch info