upgrade to tournament 0.20.2 and do some small cleanups
0.4.4