Joined up some routes, made running from battle always work, removed some debug spam, maybe messed up line endings