Add removal options, fix one bug