improve build flow and file watching