Fixed some stuff from the CodeReview.txt