more fixes, working on click-to-edit