[all] various tiny improvements...