Fixes, improvements, and new --continue option