Fix Bits and Pieces.
Old Mess cleanup.