updates to setup for demo combat