Teardrop, YinYang, and Shield plus buf fixes.