Fixed

Fixed, using "until" and turning long mode into a yes/no option.