Various updates, added jquery