some smaler changes