adding combo boxes and bunch of other fixes