some rather minor changes