Updated to pull data #25, #28, #29

Fix #25, #28, #29