Mostly Cleanups and small fixes.