bugfixes + added delete action