Clarify default play vars, clean up, mark sections, clean tests