misc minor changes - see commits