small tweaks, cleanup, sound fix