Prepositions fix

fully apply PR #25 

* apply prepositions fix
* update location of data files to point to github instead of deprecated downloads