added editing-functionality and improved adding-functionality