jquery change, and some minor changes