Fixed bugs, Buffers are working as expected