added some computed properties and edit functionality