Included more functional and terminal node options
Fixed data scrape