State and Transition Tweaks