Fixing blur, tweak build process