Update

Logging added
FileWatcher issue resolved
Other enhancements