Merged stuff

buffers done + text editor combined