Included the fixes from the english review.