replaced report(), replaced all 'eval' calls use, replaced 'echo', edited files to improve quoting and structural consistency