added buffer-move + notes