Fixes, cleaning.
Minor changes.