clean up.
Minor fixes.