another few minor changes