Formatting
Modified to latest builds
Add sample output directory
Minor tweaks