fixed editing issues