few changes

remote data not parsing correctly as of yet