Integrate comment about "teeming"
And some dojo-battle tweaks (?)
Add lives for #179