update edit and few bug fixes