rewrote review matrix and various code cleanup