More sounds, tidying up