fixed couple bugs
rework export to xls