Fixes to batter.rb