fixed delete, confirmation etc.