Added a couple of (nonfunctional) combo boxes and did some code cleanup.