Various changes to tea.

Also tried to kill the player - didn't work.