Combo boxes and bug fixes.