more concise stable-enough logic, and poke some constants