some fixes & improvements;