merge in changes, start work on alternate formats combo box