Added review support and few small changes.