some changes
some fixes