Some fixes, but still with bugs. The excision function is almost
certainly not working properly.