Reduced uses of Buffer, added read size checking

Reduced uses of Buffer, added read size checking #100