added some final touches for jn review