changed some things mentioned by gjn