assorted fixes, edit/delete still broken