Removed a commented out 'thought'
Bombing only when there are ticking captives now
Merge branch 'refactor_int' into dev
Merge branch 'dev'