fixed grunt issue and timer iusse