some small adjustments and added the ability for timer to have different
limits