Fixing some small bugs, adding option to setup file watching, Fixing error in a log statement