Update some fixes in Reviews and comments from Spatcher.php