review comments

Looks good, only to micro issues
Fixed.