Various fixes. Making PLAYBOOK an option