various changes. updated setup script to work for newest version of spark, etc