added many minor changes over last few days.