Complete blending and fix bugs