solved basic editing issues