Cleaning up, fixed pages, temp fixed watcher