Improved restart handling and ability to watch multiple directories