more little changes

More little changes