Minor changes + sound test