Small changes. TODO's review.