Improved HttpParser and bugfixes from last commit