Improved Sound class a little