Last updates based on github review.