Fix up tennis and clean up a few more things in the code.