some more Small Changes