misc improvements
merging