Final buffer fixes and added recipe