Bug fixes and sound improvements