added latching sfx and some minor cleanup.