Features added; corrections