clean up stuff, add watched list