Improve Repository Watch Path Logic, Other Improvements & Bug Fixes