More slight changes, removed anything that was music specific.