Bug fixes, introduced bdf-si def output option