added a few minor changes