changes required to integrate with jellyfish

This also fixes an issue with boluses that don't have a completion event.