Some usability changes and clean up.
Test
Changed where I put the file separator.
Final additions before Merge.