Added basic editing (r, J, ~)