Some fixes for spaces in filenames
Modifications and clean up.  Added tunables for bowtie