some cleanup, human readable formatting, and more minimum time delay testing