updates to combo, various fixes/tweaks