Bug fixes; sound work