minor value and timing tweaks