Lispy things, buffer-move, cleanup