fix more bugs with --skip and --until
2 files changed