refine structure + watch list + settings update