Refactoring build.
Fixing lost response handler problem.
Fixing buffer stream.
Fixing merge conflicts.