add "Move to Trash"; fix several bugs