fixed bug with import; fixed editing conditions