fix
almost done with struct of report