here and there some changes