Better cell editing, fixes #6