adding other fixes from pull requests