Add plause/pause indicator and refine buffering