some changes done last monday, next step is to remove hyp/hyper comboboxes from gui and redesign