6.00.2x-CS-Python: Some improvements.