Updates to shape editor, part 2