Last updates and fixes before the review