+ Code cleanup / more sound updates