Fix Comments
Fix Watch folders