Update save and buffer stuff