2.06.3:Battle buny:3 More optimization

*Restored "prisoner = no" where appropriate
*Some further optimization tweaks