Some more Small Changes