CR Fix + lots of bug fix in financial reports