Improved battlereport parsing