Making bootstrapping more robust.
Fixing the `mark` command.