Sadly no threading now but some more improvements.
some fixes.
More fixes, and refacturing.