think I fixed some issues in vanish.  need to think to convince myself it's correct