fixed jquery conflict
fixed comments