minor changes and two new switches

see individual diffs