bug fixes, stability enhancements, less threading :)
resolved conflicts