Bug with paths fixed.
Minor changes.