- added fixes and updates from various github forks