fix few bugs, track follow as activity