Added another combo and did some minor code cleanup