Resolved some bugs and Pause implementation