NORMAL added severl improvements to buffer usage