fixed some twiddle and enum bugs