minor improvements to state updates, ft zeroing, etc