Fixed the 'call by' tracking bug. Successfully generated needed Matrix structure.