misc improvements...