updates to framework and listandedit