renamed some variables
moved tumblr code to separate branch