Small Changes and updates