fix various little bugs related to format options
7 files changed