Commenting improvements, twiddle case