support resuming when using --build, fix some whitespace