2014-09-22

update variables
simplify logic to create new columns in dataframe