minor updates base on Don good advice