Multiple choice is the obvious improvement if you have more codesize. Otherwise adding distance buckets can also be helpful. Cotillion does both of these.
Awesome! I'll try one of those later =)
