Added file watching, seems to be stable.