bungle Cleanups and fixes.