finish up some final touches and close #9 with a fix to the time calculation