Added ProcessWatcher + fixes