Improved sound wrapper

Now it correctly deals with limited sources