Minor battle changes, including debug no encounters flag