misc improvements
md