added tweet point data
fixed merged files