A few stuff to review

See commit comments