cleaning up the peer review system
merged two versions