Overhauld commands, fix new sound names, cleanup