A few minor changes. Abandon R for JS