Fixed scratch buffer and added move-text.