Review completed

Looking good. Comments inside with REV tag