Bug fix and add GM time cmd