added icons;
some improvements;