fix bug, add a few more time granularities