Fixed typos in Buffer
Added Window