fixes in delete, collapse and history classes
fill now ends in face mask mode
updated except handling in get_mask_from_object_type