Updated to pull data

Fix #25, #28, #29