more sound fixes and minor style changes