- cleanup logging
- fix a bug where a calculation could become wedged if it was queued when the state machine thought it should be queuing dependent calculations