time fix done!

Also added stop buttons!