Working on reports
bug fixes