Added options to show/hide progress/marking and whether to mark incrementally