Fixed most remarks from the reviews.