FileWatcher improvements and system.py resync