Some issues with the buffer amount and progress bar.

Will need to look at further.