Fixes #56, #55 - Better rounding and waiting on timing table