improved file watching
logging cleanup