Small changes, priotiy TODO