further work to integrate with Twitter and miscellaneous changes