Fixes.

PCCleanUp Recoded.
Fixes.