-removed dumb time calculation bug -.-