fix bugs in editin'
'