Setting : peek update and fixes