Bitching fix

Fixing all the bitching.