merge
better audio buffer management
merge
player fixes