various minor
use more let