a few minor changes again