misc improvements.