improve battles feature and fix bug