Mostly Cleanups and small fixes.

Mostly Cleanups and small fixes.