added methods until and until_not as wrappers around _until. fixed method calls to until