some change
some fixes