Safety fixes, timing tweaks, state changes