new todos
fixed serious flaw whith handling last matches