some fixes
some changes